From: Andres Lagar-Cavilla Date: Wed, 18 Apr 2012 15:49:55 +0000 (+0100) Subject: x86/mm/shadow: enclose an OOS function in the proper conditional ifdef X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=2e38194c866e3518de42a02676d71219ab141932;p=xen.git x86/mm/shadow: enclose an OOS function in the proper conditional ifdef Otherwise compilation fails if the feature is disabled. Signed-off-by: Andres Lagar-Cavilla Acked-By: Gianluca Guida Committed-by: Tim Deegan --- diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 511a69e586..62ac0dd975 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -248,6 +248,7 @@ shadow_check_gwalk(struct vcpu *v, unsigned long va, walk_t *gw, int version) return !mismatch; } +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) static int shadow_check_gl1e(struct vcpu *v, walk_t *gw) { @@ -263,7 +264,7 @@ shadow_check_gl1e(struct vcpu *v, walk_t *gw) return gw->l1e.l1 != nl1e.l1; } - +#endif /* Remove write access permissions from a gwalk_t in a batch, and * return OR-ed result for TLB flush hint and need to rewalk the guest